Merging into Master late

Merging some changes and new posts into master.