Merge pull request #157 from shaunarundell/master

Fixed bugs #136, #116 & #155
Merge remote-tracking branch 'upstream/master'