fix(travis): Travis VM error (refs #18)
Merge branch 'master' into dev
Merge branch 'dev'