Merged 0.5.1