bug-fix for issue #82
Merge pull request #83 from rockiee281/V04_TO_V05

bug-fix for issue #82