Added some changes fix #2