more bug fixes, clarified iostream usage
Merge pull request #19 from mvankeulen94/master

more bug fixes, clarified iostream usage