asvid Merge pull request #4 from asvid/develop