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