Code modifications
Merge pull request #7 from 7Pikes/pullreq1_improvements

Code modifications