New stuff and tweaks
Merge pull request #119 from cybrxkhan/patch-3

New stuff and tweaks