Issue #14 fix
Coding standards fix
Adding to hashArray was in wrong place
Merge pull request #16 from filipc/master

Fixing #14