Working

1st pull request to master