fixes #4, added settings