final fix
Merge branch 'featuremerge' of https://github.com/photonerddan/gets_n_puts into featuremerge