Cleanup code and fix pagebreak display issues
Code improvements and cleanup
cleanup
bump version
Merge pull request #16 from Gared/display_issue

Fix display issues and do code improvements