Changes from Dec 17 2014

Sync with Egnlish and Russian
Merge pull request #1 from rizado/master

Changes from Dec 17 2014