Merge pull request #17 from aramonc/master

Schema & Import changes