Merge pull request #2 from ziorinfo/HotFix1

Hot fix1a Merger to Development
Change3

Change3
Merge pull request #3 from ziorinfo/Development

Development Change3 Merger to master