#94
#95
New version: 1.0.1
Merge pull request #96 from ivmarkov/master

#94, #95, new version: 1.0.1