initial commit
Merge pull request #1 from makakoa/dev_branch

initial commit