Bugfix: handling newline variants on dictionary creation.
Merge branch 'development'