Fixed Issue #68
Merge pull request #74 from insignia4u/issue-68

Merged #68