Development branch

Merge in changes from Dustin.