Merge pull request #45 from claudius108/master

Replaced 'commons'