Merge pull request #41 from Cyan4973/dev

Dev