updates
Merge pull request #7 from andrewraynal/master

updates