reinvented version
Merge branch 'jagger2.1' of github.com:sidias/jaggery2 into jagger2.1