Made some additional Changes and adjusted the Case of Variables.
Signed-off-by: Kevin Kirkpatrick <kevin@vmotioned.com>