remove compile warnings
fix test failures
Merge pull request #60 from psakar/master

fixed test failures