Fix Issues due Commons
Merge pull request #65 from cortiz/master

Fix Issues due Commons