Merge pull request #23 from temcocontrols/master

Update 2014-6-27
Merge pull request #131 from ALEXLCC/master

Merge pull request #23 from temcocontrols/master