Update for latest compiler
Merge pull request #6 from infinityb/master

Update for latest compiler