Removing unnecessary/obsolete files
Adding error messages, fixing removed includes
Adding more validation
include hell
Adding tests
More tests
merge
Merge remote-tracking branch 'origin/master'