0.1.2 update
More robust.