Fixed spacing align,ment & additional checks
Merge pull request #1 from grappler/patch-1

Fixed spacing align,ment & additional checks