Fixed Issue #62
Merge pull request #64 from insignia4u/issue-62

Fixed Issue #62.