Resolved issues #96 and #101