Implement feature #117