Updating Flashwave branch

Shouldn't affect master