commit afan 2
Merge pull request #2 from candramelon/afan

commit afan 2