Merge pull request #1 from thunderdomes/dev

add common