-Fixed Hashable data concern
Merge branch 'develop'