bumped version number
makefile: refactoring, avoid using IFS
Merge remote-tracking branch 'troubadoour/master'
bumped version number
updated generic makefile