fixing merge
Merge pull request #48 from RAlmada/master

fixing merge