Updating to master

src/nbin_standard.cpp

@@ -264,7 +264,7 @@ void NBinStandard::bin_atoms()
 double NBinStandard::memory_usage()
 {
   double bytes = 0;
-  bytes += maxbin*sizeof(int);
-  bytes += 2*maxatom*sizeof(int);
+  bytes += (double)maxbin*sizeof(int);
+  bytes += (double)2*maxatom*sizeof(int);
   return bytes;
 }