Minor Fixes #158

Closed
Llewellyn wants to merge 3 commits from staging into master
pull from: staging
3 Commits