Merge pull request #106 from XTZGZoReX/master