updated to version 2. including fix for nomedia