Added fibo issue + test, minor code refactoring