forgot to add coveralls env vars to unit test, passing now
Merge remote-tracking branch 'origin/master'