Moved stuff around
Merge branch 'master' into tests