Commit 2bc7bdbb3fbc052b84830d7bd5c7d71892ff30b0

Steffen Jaeckel 2017-04-09T00:51:00

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