Result mode plus other cleanups
Merge pull request #205 from zznate/result-mode

Result mode plus other cleanups