Step up version in code
Step up version in code
Restore correct paths in Makefile
Step up version in code