Merge pull request #233 from Secrus/migrate-to-md