fixed errors due to changing method signatures
Merge pull request #6 from realmarcin/master

fixed errors due to changing method signatures