fixes to original
Merge branch 'master' of git://github.com/jluciano/ichoose