Moved changes from #33 and #34 into the 2.0 development branch.
Merge pull request #36 from Jonnycake/2.0-development

Moved changes from #33 and #34 into the 2.0 development branch.