Merge pull request #3 from cpieloth/master

Further changes for better library support (UPDATE)