fixed references and imports
Merge pull request #4 from Dennisbonke/master

fixed references and imports