fixed #26
Merge branch 'master' of github.com:eeue56/pycho