some refactoring
Merge pull request #4 from Skablam/added-more-methods

some refactoring