updating for 1.0
updating for 1.0
updating for 1.0
updating for 1.0
updating for 1.0
Merge pull request #15 from julien/master

updating for 1.0