Fix #13, fixed Makefile and .gitignore
Merge branch 'f13-makefile' into devel