Merge pull request #23 from temcocontrols/master

Update 2014-6-27