Jambroni 2.0
Merge pull request #1 from Nguyver/master

Jambroni 2.0