Haacked patch 1

Pulled myself into project and merged my master with github:Haacked-patch-1, before closing at least once.