Bug Fixes. Moved library to seperate library to easily allow of integration and to resolve ARC issues.
source cleanup