Basic MD handling added. #68