Merge pull request #13 from himedlooff/master

Small CF tweaks.