Fix #2
Merge branch 'logan_test' of https://github.com/amberheilman/mousetrap into logan_test