Updated from github wiki pages