Merge pull request #7 from ryanande/develop

merging develop into master.