bug fixes (warning: breaks 10.6.)
Merge branch 'master' of github.com:stal888/Poison