Merge pull request #85 from whot/wip/static-lib-sources