Merge pull request #8 from wilx/master

Merge.