Fixed Dot Offset
Merge branch 'development'