dougsland Merge pull request #6 from reivaj84/patch-1