Merge pull request #82 from mattjbarlow/staging

Staging
Better late than never ... Helmut
Merge pull request #84 from mattjbarlow/helmut_dev

Helmut dev MERGED