Merge build_niels

Hi Misha,

Please test whether this branch works for you as expected. If so, I recommend to merge the changes I made in order to make build process to work on my PC.

Thanks! Niels