#10 Modernize code
Merged by fmuellner. Opened by fmuellner.