manuel-domke Merge pull request #96 from leetronics/master