24.09.2014 from live
Merge branch 'master' of https://github.com/vargus/omega