bug fix
Merge branch 'develop' of https://github.com/javamonkey/beetl2.0 into develop