working on #15
Merge branch 'master' of github.com:eeue56/pycho