merged
Merge pull request #16 from freddiefujiwara/master

fix conflict
Merge pull request #17 from udam/develop

Develop