0.3.1
Merge remote-tracking branch 'origin/master' into HEAD

Conflicts:
	package.json
improved main auto-generation;
ALSO SET \n AS LINE SEPARATORS
improved main auto-generation;
ALSO SET \n AS LINE SEPARATORS
improved main auto-generation;
ALSO SET \n AS LINE SEPARATORS