More bug fixes
Merge branch 'master' of https://github.com/strivedi183/publishing-hackathon-13