Merge pull request #8 from vyazovoi/master

fixes for localized environment
Merge remote-tracking branch 'upstream/master'