Merge pull request #13 from stephandev/master

Commit for testing purposes.
Added plus/minus buttons.
Bug fixes.
Merge pull request #115 from mshamash/master

Bug fixes.