Dev to master

Should be merged into master; its about time.
yeah