Merge pull request #5 from ryanande/develop

merge.
Merge pull request #6 from ryanande/master

Merge pull request #5 from ryanande/develop