Last version before Refactoring

Merge pull request #9 from spinicist/master

Removed min/max macros to prevent header include problems with LLVM.