Release v1.0

Fixed Makefile
Merge branch 'master' into devel
Should have checked the htmls