closes #52 (for now)
Merge branch 'master' into upload-doc