Merge pull request #32 from vrz/master

unit test for issue #21