Merge pull request #1 from razvand/gh-pages

Replace most TODOs