Merge pull request #61 from wilx/master

Merge.