added more alts
Merge branch 'master' of github.com:AktionLab/chickun2 into production
change iterator to take_while, remove error checking
Merge branches 'production' and 'master'