Add main property to package.json, closes #244
Merge remote-tracking branch 'upstream/dev' into dev