Further Improvements
Merge pull request #3 from DanyalZia/patch-2

Further Improvements