Merge pull request #121 from samoht/master

update