Fixed Issue #11
Merge pull request #37 from insignia4u/Issue-11

Fixed Issue #11