Merge pull request #2 from luc-luc/master

Updating the beast
Hopefully fixed build settings
I forgot the basics..
Merge pull request #3 from luc-luc/fucktomcat

Fucktomcat