Rebase of PR 13 without whitespace

See #13