Simplified the instructions a bit, especially for pip.
Merge branch 'issue42' into devel

Closes #42