Merge pull request #141 from abouffard/master

Simplified schema and tweaked some bits