Remove XML dependency
Re-fixed #45 and other bugs
Changed info