Fixes #11 - Updates for Angular and Mean