tweaks and stuff
update makefile
allow custom middleware
Merge pull request #58 from adamrenklint/next

0.9.18