Merge pull request #58 from wilx/master

Merge.