Added settings to fix #17