Merge pull request #12 from nubs/master

Update composer