Merge pull request #71 from morevnaproject/master

Maintenance fixes