Dev/ref#43