Merge pull request #2 from mmwtsn/dev

Updates Master