First commit
Merge branch 'master' of https://github.com/ytisf/combina-0.4.2
initial merge