upd 25-12-14 1
Merge origin/master