0.1

Merge latest commits