Merge pull request #144 from dildick/master

use helper functions
bugfix
comment out reader