Merge of changes from st-luke fork, with additional changes to the makefile