Develop

Merge in latest from bitstadium.