Merge pull request #7 from ktsWeb/KTSDEV

Ktsdev
lattest changes from Eric
Merge pull request #27 from ktsweb1/devEric

lattest updates from eric *Fixed Merge Issue