Merge pull request #11 from anehrkor/master

merge for next production
sync with production 2014