updating docs
Merge branch 'master' into docs
updating readme
Merge pull request #17 from SirHound/docs

updating docs