Issues #113 & #114