This is part of Alexy task #217 
Closing since Genday performed the code review