Code

Merge branch 'jk/credentials'