fix #6
Merge pull request #7 from turn/personal/yjin/issue-6

Fix issue #6