Fixed #2, updated version