Updated for 64-bit
Merge branch 'master' of github.com:lolay/investigo