manual merge of pull request 7 and fixed awful compose.