Merge changes to master

Check if develop still works so I can work on merging.