Merge pull request #9 from reexjungle/dev

Dev
Merge branch 'dev'
Merge branch 'dev'