Added code distinguishing static/instance methods (#16)