Todo update#2
Merge pull request #2 from Kotrba-Barton/Barton

Todo update#2