WIP issue #2
fix issue #2
fix issue #2
Merge pull request #21 from siso/f-2

F 2