Resolves issues #95 & #96.