Files renamed, Conditionals added
Merge branch 'master' of github.com:svenstaro/kartoffel