Merged changes and fixed an issue where the start-angle wasn't set
Merge remote-tracking branch 'origin/master'