Big update, read comment
forgot to add new files from library inlining
Merge pull request #62 from exside/master

Big update, read comment