Fixed #24 issue.