Merge pull request #6 from fishkel-truelogic/personal/avivona

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

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

#3
#8