General nitpicking
Improve update instructions
Merge pull request #293 from tannn/testing

Testing to master