add fib function
Merge branch 'master' into iss53

Conflicts:
	test.py
merge test
Merge tag 'v1.2'

version1.2