some fixes
merge
merged
Merge branch 'jmeprototype' of github.com:gormed/drunken-nemesis into jmeprototype