Merge pull request #12 from nkampy/master

MACI64 bit method
Merge pull request #11 from nkampy/Linux-64-bit-install

Linux 64 bit install
Merge remote-tracking branch 'jowr/master' into develop to take in account the modifications jowr accepted in the master branch from nkampy