TestAndAdd bugfix
Merge pull request #14 from ondi/master

TestAndAdd bugfix (thanks, Bondi)