Pull request batch3: Batch of my different pull requests

Following pull requests are grouped in this PR:
#412
#371 (rebased)
#381 (README -> README.md) + prices updated