fixing support for both 32/64 bit builds
Merge branch 'develop' of github.com:pcpratts/rootbeer1 into develop