Issue #52 first version