More updates
Merge pull request #17 from 007au/master

More content