Working on #18 issue.