Merge pull request #1 from AndreArtus/master

Corrected "Jenkins"
Refactored to presentable state.
Merge pull request #1 from Burtronix/master

Sync with upstream