Fixes, endpoint improvements
Merge branch 'master' of github.com:maxscheiber/cumulonimbus