formatted a bit
ubuntu
some sanity checks
Merge branch 'master' into ubuntu
new version