Fixed missing returns in Linux specific code
Bumped version to 1.2.1
Merge branch 'develop'