finalized changes for bug #170
Merge remote-tracking branch 'origin/develop' into easteregg/KonamiCode