Clean up
Added compose
Merge branch 'master' into answers
Added compose