Merge pull request #11 from varutap/hotfix/HotFix1

-Hot Fix 1