Issue 86

Please review it. Thanks