Quick and Dirty Fixes for Issues #80 & #83