base version
Merge branch 'master' of https://github.com/rwesz/our_jason