Closed issue 24 on orionshoulders repo