prototype updates 101213
Merge branch 'master' of https://github.com/jluciano/ichoose