Merge pull request #70 from maksimov/master

Added more tests to improve coverage slightly