Dev/ref#96