ecor Merge pull request #4 from ecor/dev