Some code improvements
Merge branch 'master' of https://github.com/stg34/mujump