Fixed #22.
Created issues in github.
Fixed bug related to #22