Merge branch 'hotfix-2'
iostream is so cool!
Merge branch 'hotfix-3' into development