0.3.alfa.6 egg edition
Merge branch 'dev'