dannon Merge pull request #6 from eggzilla/master