Merge pull request #138 from hashview/dev Dev
Merge pull request #128 from hashview/dev Dev
Merge pull request #90 from hashview/dev Dev