Merge pull request #4 from Jbekker/master

Merge latest changes
Add a configuration form to change some settings.
Merge pull request #5 from Jbekker/stable

Add configuration form