Merge pull request #3 from CoreProc/dev

-s flag in composer doesn't actually check branches, but tags.
Merge branch 'master' into dev

* master: