Merge pull request #24 from Plloi/master

Fix Error in comeAtMe
More fixes for comeAtMe/added unit test for comeAtMe