tboerger Merge pull request #46 from evrone/master