Merge pull request #63 from wilx/master

Merge.