final changes before beta
Merge pull request #59 from jolevesq/last-changes

final changes before beta