0.5.6 merge

Hopefully the done properly