DONE
Merge pull request #8 from chikim/develop

DONE