Dev to master

Should be merged into master; its about time.
Are you planning to add a name for each major version? ;)