Misc changes
Merge branch 'master' of github.com:azenk/smoker-api