fixed #2 #5
Merge remote-tracking branch 'puchimine/master'

Conflicts:
	lib/puchimine/puchimine.py