V0.5.1

Merged up to v0.5.1