Merge branch 'connect_database' into 'master'