Merge pull request #18 from Jamiltz/fix/bugs-refactor-methods

Fix/bugs refactor methods
Merge pull request #19 from Jamiltz/fix/bugs-refactor-methods

Fix/bugs refactor methods