prvy commit
druhy commit
Merge http://github.com/petersarmir/omega