Merge branch 'patch-3' of https://github.com/yarons/mygpo into yarons-patch-3