PEP on periscope.py
Merge branch 'master' of github.com:julfla/periscope

Conflicts:
	periscope.py