Merge pull request #2 from ChinosInternationalCC/master

update 06022014
Merge pull request #3 from ChinosInternationalCC/master

update 08022014
simple update to try to compile
Merge pull request #46 from chopsuey5000/master

simple update from l'estruch to try to compile last version
Merge pull request #7 from ChinosInternationalCC/master

update