mortal changes
Merge pull request #34 from lbasov/master

mortal changes