fix #89
fix #111
fix #97
Merge pull request #127 from UniversityRadioYork/issue-fix

Issues fix