lots of changes
Merge branch 'master' of https://github.com/ryanlogs/kalipso