Updated code
Updates to code.
Merge pull request #1 from Sepero/master

Updates to code