Added unit test to reproduce #67.
Fixed formatting.
Fixed #67.
Merge branch 'master' into feature-load-with