Trivial fixes
Makefile: Add -fPIC option to fix build error on x86_64
Merge branch 'develop'