Fixin jenkins problems
Merge branch 'master' of https://github.com/thenokar/endervanish