Implementation of Issue #103

Simple changes to implement #103 and use the features provided by #98