dbyrne Merge pull request #4 from skeryl/master …