Merge pull request #657 from thiagogenez/feature/updating-alignment

Feature/updating-alignment
1 job for master in 99 minutes and 40 seconds (queued for 20 seconds)