[FIX] generateHash method works now
Merge branch 'dev'