Bugfixes
Merge branch 'dev' of https://github.com/JHUISI/charm into dev