added file and folder to 0.3
Merge remote-tracking branch 'origin/v0.3'