Merge pull request #10 from mambax7/master

updating include statements
standardize code
Merge pull request #11 from luciorota/master

standardize code