Merge pull request #17 from allanderek/dev

Dev