Improve scalability, add alignment customization
Merge pull request #1 from Daniel-Hug/master