FINAL version
Merge branch 'master' of https://github.com/moajohansson/IsaHipster