Merge pull request #38 from aringlis/master

Some fixes to get code up to date and working
reorganised import statements