Implement feature #25 @15min