Merge pull request #103 from XTZGZoReX/master