Merge pull request #119 from gameblabla/piofix