Update Spells from master

Updated with latest changes from master