Fix issue #11
Merge pull request #12 from cznic/master

Fix issue #11
Merge branch 'master' into better-encryption
Refactored utility read-writers to separate file