Merge pull request #4 from maryokhin/development

repackaged