Merge pull request #3 from dreadwarrior/master

Merging master branches to get upstream up-to-date.