#9 added new method signature, #2 fix