ready to merge fixing issue #21