Some more updates and corrections
Merge pull request #141 from vytux-com/patch-5

Some more updates and corrections