Fixing the issue and close #17.