Pulling Akylas-master In

Integration of #246 .

CC @tmcw @farfromrefug