Issue111

This pull-request include #107