Issue 15 fixed (New line problem)