Fixed Issue One
Merge branch 'master' of git://github.com/ShuliChen/python_bugs into ShuliChen-master

Conflicts:
	problems.py
t push origin masterMerge branch 'ShuliChen-master'