Thanks Dirk, closes #41