Update files
Merge pull request #34 from idleberg/1.0-dev

Update files