peer review
Merge pull request #3 from reqshark/master

peer review