Merge branch 'master' of github.com:jtibbetts/memento
added passthecap