Merge pull request #163 from rjbaucells/develop

norm() implementation
Merge pull request #3 from josdejong/develop

Merge pull request #163 from rjbaucells/develop