Merge pull request #21 from pondering/master

move common out