Merge pull request #4 from slamke/master

update20140711-1