Great additions.
Two fixes.
Merge pull request #3 from lavigor/master

Great additions.