Merge pull request #12 from ams-bjones/master

added tests