Bunch of additions.
Merge pull request #17 from gu1dry/patch-1

Bunch of additions.