Merge pull request #171 from allegro/develop

Merge with master
Merge pull request #185 from allegro/master

Merge pull request #171 from allegro/develop