Merge pull request #81 from sawickiap/master

Merged tight alignment feature from a branch