Merge pull request #6 from wilx/master

Merge.