code changes from work done in Ops Summer Project
Merge pull request #1 from zeppytoh/develop

code changes from work done in Ops Summer Project