Fixed the last issue #24 for milestone 0.1.0-beta1.

Fixed the last issue #24 for milestone 0.1.0-beta1.