Merge pull request #3 from anehrkor/master

merge for next production
fix Vladimir's fix
Merge remote-tracking branch 'upstream/Production_2014_Jan_21'