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

More changes