Add Composer fixes
Merge pull request #6 from RobLoach/composerfixes

Add Composer fixes