merging
pull from ryan
Merge branch 'master' of https://github.com/RyanYapVidao/martini-middleware
testing