Fixed issue 59 and made some other fixes
Merge branch 'master' of https://github.com/lightblue-platform/lightblue