Merge pull request #3 from simkam/patches-master

added new tests