Finish 4f
Fix merge conflicts
Merge pull request #3 from ianks/ianks

Finish 4f