Fixing issue #2
Merge branch 'master' into schema_refactoring