Pull Request - Bug Fixes

Closes #51, #52, #53, #55, #56.