Merge pull request #166 from netux79/master