resolved issues #6, #7