Added everything #4
More lines #4
Merge pull request #5 from phoebus/issue/4/some_fix

Issue/4/some fix