some additions and some edits
Merge pull request #41 from ghtmtt/master

some additions and some edits