update_20140519
Merge pull request #60 from a1mery/master

update_20140519