Merge branch 'develop'
added tests. Pushing to master!