Issue196 borehole

Merge bugfix to master.