Tried to fix problems with offsets
Tried to fix problems with offsets
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Tried to fix offsets not appearing properly
Tried to fix offsets not appearing properly