Fix make
Minor fixes
Bump version: 3.3.1 → 3.3.2
Merge branch 'develop'