#11, #16
Merge pull request #36 from ivmarkov/master

#11, #16