Speed improvements and bugfixes
Merge branch 'master' of ssh://git.code.sf.net/p/hesed/code