Fixes #421 and bill-long#1

This fixes #421 and https://github.com/bill-long/chocolatey/pull/1#issuecomment-36649015
Merge pull request #2 from Redsandro/patch-5

Fixes #421 and bill-long#1