Test

Pulling in changes found in kontur's version with my own fork