Merge branch 'develop' of github.com:RyanNielson/hashpipe into develop