fix some leftovers from previous merge
Merge pull request #6 from rwchhs/develop

fix some leftovers from previous merge