fixed alignment and changed includes order;
Merge pull request #3 from dysfunc/bugs

fixed alignment and changed includes order;