Fixes issue #20 on Github
Merge remote-tracking branch 'upstream/master' into notice-fixes
Fixes #19 & #20
Merge pull request #43 from galactic-void/notice-fixes

Fixes issues #19 & #20