Merge pull request #171 from allegro/develop

Merge with master