Updates

Superseed #29 and #25