iostream is so cool!
Merge branch 'hotfix-3'