Merge pull request #1 from conceptuli/master

pull
Merge pull request #2 from conceptuli/sails-v0.10.0

Merge pull request #1 from conceptuli/master