Merge pull request #26 from cpp-2016-autumn/develop/pacmancoder

Stabilization stage bug fixes and improvements