Merge pull request #8 from willibles/master

Updated tests branch