More portable. Updated to version 1.0.1