first commit
Merge https://github.com/jonslucas/dimsa