Partial implementation of requirements for issue 130
Merge pull request #159 from yevgeller/master

Partial implementation of requirements for issue 130