Merging code from develop to master

Also fixing merge conflicts.