Merge pull request #10 from phillip-haydon/master

More tidy up
Archive fix
Merge pull request #11 from jchannon/archivefix

Archive fix