First commit
Merge branch 'Skydreamer-master'
merge conflict
Merge branch 'vaclav-master'