Dev to master

Should be merged into master; its about time.
heh, don't even remember adding that :)