Added settings

Closes #4
Merge pull request #12 from tytan34/beta

Added settings