Merge pull request #15 from HeavensGate/dev

Dev
Merge pull request #16 from HeavensGate/dev

I've tested all this now.
Merge pull request #21 from HeavensGate/dev

Dev
Adding Daleks changelog for him :3