Commit efcac86cace10e70bbaca589d97975aea5105aab

Steffen Jaeckel 2017-10-15T12:01:15

Merge branch 'fix/67' into develop This closes #67