Nax Merge pull request #13 from alganet/master