nothing
Revert "nothing"

This reverts commit 03eaeb284cee069670944507b6bddaf111d5150b.
Merge remote-tracking branch 'origin/master'
Merge pull request #19 from christiansandtveit/master

Sync my working branch with master