Merge branch 'master' into dev
More for the README, added an item to the TODO list.
Merge branch 'dev'