Added settings

Closes #4