fixed issues
Merge branch 'develop' of https://github.com/ajency/xooma-track-go into develop