#21 #22
Merge pull request #23 from fishkel-truelogic/personal/lfishkel

#21 #22