Dev/ref#167