Merge pull request #1 from fmi/master

Sync with fmi:master