Merge pull request #7 from ryanande/develop

merging develop into master.
Merge pull request #9 from ryanande/master

Merge pull request #7 from ryanande/develop