Fix merging issue
Merge branch 'master' of github.com:SteveViss/C-STMFor
Fix merging issue