fix for coveralls?
Merge pull request #328 from tochman/develop

Fix for coveralls?
Merge pull request #329 from AgileVentures/develop

Pushing to Staging