Upgraded to make it work on 32bit windows too.