Merge pull request #1 from llelectronics/master

Merge from personal playground