Merge pull request #12 from 0xor1/master

Merge pull request #11 from 0xor1/dev
Merge pull request #13 from 0xor1/dev

Merge pull request #12 from 0xor1/master