Fix #2 and update to 0.1.1