Changes

Changed some things around
Merge pull request #24 from interdpth/master

Changes