make .so as well
Merge commit 'b07df54'