Closes #76 (closed)
sorry, the branch has the wrong number, ticket is #76 (closed), but branch has 78- prefix