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

Personal/lfishkel
Merge pull request #13 from fishkel-truelogic/personal/lfishkel

#12
#14