DONE
Merge pull request #22 from euglazer/additions

DONE