v1.20130615

 - bug fixes and purge unused classes