Merge pull request #120 from wimr/master

update with latest commit