Merge branch 'fix/compatibility-with-mac' into 'master'
Fix/compatibility with mac
See merge request !11
(cherry picked from commit 4bfc2227)
2dda34fc [compatibility] Use unsigned int instead of uint
726861fe [compatibility] Use <memory> instead of <tr1/memory>