Merge methods into single method & add yardoc comments a bit

TODO:
- make more tests
- integrate simple-cov
- better documenation