Merge pull request #1 from defact0/master

AA
Merge pull request #4 from viennastick/master

Merge pull request #1 from defact0/master