Issue 36
issue 35
composure #33
composure issue32