First pass for Rothfus #24
Merge pull request #789 from sinned/master

First pass for Rothfus #24