Fix current version
Add package rule to Makefile
Merge branch 'master' into develop