Issue27

Depends on my PR #37