Meth0d Merge pull request #58 from flx5/master