Merge pull request #3 from russdanner/master

Integration fixes / porting
Merge pull request #4 from russdanner/master

removing a lot of unused share