Merge request regarding #5

see #5