merged
Merge pull request #16 from freddiefujiwara/master

fix conflict