Feature/issue 142

Let's see if this works.

Since your Issue-142 branch is building correctly, merging this into the develop branch, should also result in a successful build, right?