Merge pull request #3 from Arepo/Developer

Developer
End of Wednesday
Merge pull request #4 from jwhyte88/Developer

End of Wednesday
Defunkt commit