Merge pull request #5 from alexames/master

Sync
Improved Force Add / Fixed Stop bug
Merge pull request #37 from PixelOrange/master

Improved Force Add / Fixed Stop bug