fixing issue #1 and #2
Merge branch 'master' of https://github.com/Freecence/The-Wacky-Times