Update to 0.18.1 + add makedeps + sourced from github