added automatic check for 64 v 32 bit architecture
Merge branch 'master' into 1.0.1