Fixes #50
Merge with GigiusB