Added a lot of stuff
some merge
Merge branch 'master' of https://github.com/krsjan/raptor