Some hash changes
Some adjustments
Merge pull request #6 from corebob/master

Some adjustments