Fixing stuff!
More fixes
Merge pull request #13 from 007au/master

More Content Fixes