Added alignment. closed #3