Merge branch 'dev' of github.com:0pq76r/lunkwill into dev (Fixes Travis Build)
Merge branch 'dev'