Merge pull request #7 from fishkel-truelogic/personal/lfishkel

#2
Merge pull request #9 from fishkel-truelogic/personal/lfishkel

#3
#8
Merge pull request #10 from fishkel-truelogic/personal/avivona

#8
#4