Merge pull request #43 from wilx/master

Merge.