v1.3.0-alpha.1: Fixed #5 and Fixed #6

Fixed issues #5 and #6, and made necessary enhancements.