API16 workaround
Merge branch 'master' of https://github.com/VT-Magnum-Research/sodacloud
API-16 workaround