Merge pull request #70 from Bogdanp/master

Add basic module imports (#66)
Update CONTRIBUTING.md
Some parser tidying, bump version, fix overlapping imports issue