Merge branch 'hotfix-0.1.1'
Merge branch 'release-0.1.2'
Added static library install location
Fix up bundle and stage

Conflicts:
	CMakeLists.txt