v 0.4

Fixing some merge issues