Merge from gabrielmanchini - issue #50