Merged changes in code from final thesis version
Fixed forgotten merge