Jons updated version
about to add jons version
Merge branch 'master' of https://github.com/metalstache/JAAK