Merge pull request #1 from kripken/master

updating local 13 jun 2014