bugfix, wrong order of file includes
Merge pull request #62 from wick-ed/master

diff reviewed, tested on Mac (travis) and Fedora