Merge darbula issue69

Merges #71 into develop. Thanks darbula.