Published version 1.0.4, with the new improvements