Merge pull request #34 from PixelOrange/master

Wiki update
Update config.json.example
Update config.json.example
Merge pull request #36 from PixelOrange/master

Improved Stop
Merge pull request #5 from alexames/master

Sync