Fixed TODOs
Merge origin/master