Merge pull request #4 from rjynn/master

s
Merging
Maps now 'work'
Merge pull request #5 from iameric1986/master

Maps "work"
Fixed crashes
Merge pull request #6 from iameric1986/master

Fixed crashes
bleh