separate commands from options
Merge branch 'master' into ubuntu
ubuntu release 0.1.2