Merged updates from K-S-V's branch
Fixed --help formating
Updated --help output