Merge pull request #15 from damjanek/master

Adding some capabilities