almost finished
Merge pull request #2 from j3py/millow_branch

almost finished