Fixed boss timing
Merge branch 'master'