prevent 'redefined' warnings and updated dependency list (Breno G. de Oliveira)
Merge pull request #26 from garu/master

prevent 'redefined' warnings and updated dependency list