Bug Fixes and Suggestions

Refer to Issue #2.