Merge pull request #57 from olerem/io_clean-2014.05.23