Fix conflict including algorithm before intrin.h
Merge pull request #166 from net147/develop

Fix conflict including algorithm before intrin.h