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

#17
#19