Merge remote-tracking branch 'upstream/master'
Fixed misalignments
Merge pull request #20 from thomas-squid/master

Merged upstream + Fixed misalignments