Reduce lib size
Merge pull request #302 from Nickproger/master

Reduce lib size