Close #32.
v0.3.3
Merge remote-tracking branch 'upstream/master'

Conflicts:
	bin/freight-add