Merge pull request #162 from adlai/master