Revert "Pulled files from hans/master"

This reverts commit 339916e5659ca83c346e4b006ec8383564f40a8d.