Fixed bug in the self-alignment example case.
Merge branch 'master' into gh-pages