Moved changes from #33 and #34 into the 2.0 development branch.
Merge branch '2.0-development' of https://github.com/Jonnycake/SimpleSite into issue-8