Fixes for issue #44 and issue #48

[Issue #44](https://github.com/shownotes/show-pad/issues/44)
[Issue #48](https://github.com/shownotes/show-pad/issues/48)