Updated documentation
Merge pull request #271 from VesaJuvonen/dev

Updated documentation