Merge pull request #4 from samhaskins/master

This should actually work
Merge pull request #5 from samhaskins/master

forgot handler
Wrong colon
Fixes