Changed include to ordering to prevent duplicate inclusions
Merge pull request #14 from oxilion/fix_include

Changed include to ordering to prevent duplicate inclusions