Added a quick patch to clean things up
Added new package