updated to newest version
Merge pull request #1 from cfarm/master

updated to newest version