Merge pull request #100 from lcdservices/master