Fixed #37, Work on #34
Merge branch 'master' of github.com:rapidsms/rapidsms.org