resolved some conflicts with schema change
Merge branch 'issue-2' into merged