Merge pull request #28 from futurice/master

Minor fixes to make documentation match the reality