Edited comments, updated version, updated license