Issue/52

Merge target olympus

Fix #52