Merge pull request #46 from ywang19/FIX_ISSUE_45

Fix issue 45
fix issue 45 update