Merge pull request #6 from pyarchinit/master

merge