Merged craiglabenz-master