Merge pull request #11 from hAdamm/master

Extending the functionality