Fix makefile.
updated wax version
Merge branch 'develop' into issue-205