Added some changes fixes #2