Merge pull request #74 from schumy21/master

Schumy24Abril2013