Blacksmith 1.0 #48

Merged
merged 15 commits into from Nov 27, 2012