Merge pull request #319 from benjello/master

Fix reform