Merge pull request #2 from eistaa/master

Added features
Fix.