Merge pull request #2 from royshadows/master

asepta
Merge pull request #1 from Furtivo/master

Merge pull request #2 from royshadows/master