Some improvements to blacksmith
Merge pull request #2 from Jay1/master

Some improvements