Merge pull request #6 from rexm/master

Merge from master