Merge pull request #53 from NoyaInRain/tod-schick

Tod schick
Merge remote-tracking branch 'origin/master' into split-remote-display