Cleaned up a bit, fixed Decrypt
Merge pull request #2 from jfrederickson/master

Cleaned up a bit, fixed Decrypt