Changes to version 0.11-pre (2014-04-12) and add Makefile
Merge pull request #5 from eliovir/master

Changes to version 0.11-pre (2014-04-12) and add Makefile