Bug Fixes and Suggestions Implementation

Refer to Issue #2.