Issue/61 ascraeus

Fix #61
Depends on #62