Merge pull request #466 from gilnoh/master

P1EDA, first instances.
Merge remote-tracking branch 'upstream/master'