working fine again
Merge pull request #82 from chitopolo/master

working fine again