Small changes and recompilation of a few files
Merge pull request #1 from Iph/master

Just committed by accident on wrong fork. need to pull