DRYing the code - needed packages
Added missing docs
Merge pull request #1 from kobliha/master

Little refactoring