updated
updated
updated Key
fixed conflicts
added tests by Dy
Merge pull request #15 from javiersuweijie/natalie

updated