Merge pull request #22 from temcocontrols/master

Update 2014-6-18