Merge pull request #36 from vikramrajkumar/master

compilation fixes