Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
fix bug align
Merge pull request #33 from ramabit/master

fix bug align
fix alignment
Merge pull request #34 from MichaelKohler/alignmentfix

fix alignment