Fixed installation issues, optimized import
Fix indentation and variable names
Merge pull request #19 from csaoh/fix_install

Fixed installation issues, optimized import