Fix travis
Merge branch 'master' of github.com:jlrogee/ipsilon
Error 500 #58
Error travis
Error travis
Error travis
Error travis
Error merge
Error merge + travis
Merge pull request #59 from jlrogee/dev

Fix 500 #58