more code changes
Merge pull request #8 from 007au/master

more code changes