completed
Merge pull request #54 from chorus-frogs-2014/touch-up

completed