(#60) Quick Fix: simplified some code.
Merge pull request #61 from robertmassaioli/master

(#60) Quick Fix: simplified some code.