FLKone/HFRplus — pull request #45 by FLKone (2012-07-19 23:06:50+00:00)
Title: Merge from Master

This reverts commit abaf293b13bde57c6928e03d89d5b915104d2cc9.