Fix missing comma and merge problems
Merge branch 'master' of https://github.com/jamesrobb/icepet