1st branch + improvements 

1st pull request to make the master branch more descriptive.