More changes
Merge pull request #6 from 007au/master

More changes