Merge pull request #41 from schumy21/master

Schumy06/03/2013 FINAL