merge of the 2 github projects, see readme for changes