Merge pull request #1 from SirAlex/master

update from SirAlex master repo