Fixing an incorrect hack (#146)
Added new hacks