fixes #10, few modification in names to clarity