avymantech Merge pull request #8 from Bushstar/master