Merge pull request #22 from temcocontrols/master

Update 2014-6-18
Merge pull request #129 from ALEXLCC/master

Merge pull request #22 from temcocontrols/master