Merge pull request #8 from dmitriydzyuba/master

Applr improvements
improvements and bugfixes
Merge remote-tracking branch 'upstream/master'