some changes and some addition
Merge pull request #31 from ghtmtt/master

some changes and some addition