Fixed things and uploaded to Maven