Updating the current master to what is live.
Merge pull request #7 from Enigmatical/feature/updating-to-live

Updating the current master to what is live.