Merge pull request #3 from hashar/minor-tweaks

minor additions