Fixing compile errors
Merge pull request #1 from antoche/swax

Fixing compile errors