Thank you Shellshock!
Merge branch 'master' of github.com:l3nz/whaleware