Merge pull request #1 from greenrobot/master

update