Merge pull request #5 from bcldvd/master