Attempt to solve line placement on Mondays
Merge branch 'development'