Merge pull request #34 from aaronmix/master

Some bugs fixed.
Added contributors section. Thanks!