test commit by john
Merge pull request #1 from fierynaga/master

test commit by john