Merge pull request #29 from wilx/master

Merge.