#76 - Modifications after review #150