Hedkandi Merge pull request #6 from Hedkandi/FixIssue