Editing documentation, makefile and configure script
Merge branch 'master' into devel