Merge pull request #512 from bjh21/bjh21-step2-empties