new functionality added
Merge pull request #2 from Nelosh/master

New functionality added!