Add different alignment options

I have seen a lot of issues related to this problem. What you can see in this PR is probably the simplest possible modification (note backward compatibility) to achieve the requested feature. I haven't done the build yet, so if you happen to accept this PR, please update the production-ready version as well.