Bug fixes line continuation
Function renaming [Issue 5]