Consistency -> Jonas Files

Update files in master branch to Jonas Fork