Reving up to version 1.0.0.4 with scott's changes.