duuuhh....
Merge branch 'master' of github.com:segfault87/Konstruktor