Updated for v0.04
Merged with master