Merge pull request #226 from akkie/master

Implement request handlers