some bward compat changes
Merge pull request #176 from adamarla/master

some bward compat changes