Resolved issues #12, #13.