Cleanup
Merge branch 'master' into gh-pages
Cleanup
Cleanup
Merge remote-tracking branch 'origin/master' into gh-pages

Conflicts:
	.gitignore
Merge branch 'master' into gh-pages
Updated annotated soucre code