Commit b8527e92f8401a79b86e779caaaf00dca83f73c7

Steffen Jaeckel 2016-10-10T00:48:15

Merge branch 'fix/56' into develop This closes #56 and #57