Merge branch 'authentication', closes #37