some grabbing update based on experience
Merge branch 'master' of github.com:daureg/illalla