Fixed default options
Merge branch 'master' into websocket
added inflector