Merge remote-tracking branch 'upstream/master'
add composer support
updated target license
Merge pull request #25 from nhp/t

Add composer file