Merge pull request #8 from willibles/master

Updated tests branch
Merge pull request #11 from willibles/tests

Fix pull failure