Merge pull request #33 from tgrrtt/develop

Slight ng refactor