AnthonyEbert Merge pull request #33 from AnthonyEbert/dev2