Merge pull request #42 from wilx/master

Merge.