Adding tests
Merge branch 'master' into add_tests
Merge pull request #3 from 11mdlow/add_tests

Add tests