Fixes issues #96 and #106