minor changes for g++ 4.7 compile
Merge pull request #2 from pederico/master

minor changes for g++ 4.7 compile