[WIP]
Merge branch 'master' into feature/method
added file name based method handling. #2