Updated docs
Merge pull request #175 from olefredrik/feature/docs

Updated docs