Fixed a bug
Fixed conflicts after pull
Final fix for second branch