More Changes
Merge pull request #29 from 007au/master

More Changes