Fixes and improvements for FR 144 (SF version). Tested and working.
Merge pull request #103 from JohannesLorenz/stable-0.4

Fixes and improvements for FR 144 (SF version). Tested and working.