Fixes
Merge pull request #3 from jolshevski/feature/simple_forge

Fixes