Debugging

Merging to master