Merge pull request #229 from hunner/update_before