Rewrite from Mov1s.
Merge pull request #61 from sdmadsen/development

Rewrite from Mov1s.