Resolved issues #3 and #4