added unit test...
Merge branch 'master' into feature