First commit
Merge pull request #49 from Ryahn/dev-3.0

First commit