Merge pull request #4 from hipsterwannabe/dannyalxndr

Fixed some bugs.