updates to Serenity
Merge pull request #501 from wdawson/serenity

updates to Serenity