Merge pull request #7 from reexjungle/dev

Dev