Update

Fixed #5, seems to be more stable but could use more testing