Update Master with latest stable dev version

lots of changes since last pull