Merge pull request #11 from radialpoint/integration

Decided against making an official release, but kept some changes needed for it
Changed version number