Commit 72d116a5b66e5d983c6bff06d4c9e662bef47dab

Steffen Jaeckel 2017-06-06T21:35:08

Merge branch 'pr/78' into develop This closes #78