issue 40
Merge pull request #41 from surangak/issue-40

issue 40