Fix #21
Merge pull request #23 from dhoko/ag_#21_common

Fix #21 - Common override