Merge pull request #3 from rigidus/master

upd
Merge pull request #4 from rigidus/master

upd
markup upd + crn chngs
Merge pull request #5 from hemze/master

markup upd + crn chngs