cleaner version of Josh's code
Merge branch 'master' of github.com:jmsaavedra/shoes