Issue 17

fixes #17 for all items mentioned