Resolved issues #1, #2