Fix #21
Merge branch 'master' of https://github.com/nicomo/cag_ios