Major changes
Merge pull request #2 from 007au/master

Major changes