Fixing warnings
Fixing warnings
Merge pull request #160 from emorency/master

Fixing build errors