Forge update

Closes #35