Dev to master

Should be merged into master; its about time.
Perhaps... but its a little longer, and I have code I would have to look through and change (many places ;)

Maybe an alias?