Fixed everything in bug #334 (1st comment).
Merge branch 'master' of https://github.com/matiboy/compargo
Merge branch 'master' of https://github.com/matiboy/compargo