Pull Request #613 Add Composure Support