Merge branch 'master' of https://github.com/ehearty/Swadl
update