Merge pull request #28 from Decagon/master

Merge pull request #1 from Seist/master
Merge branch 'master' of https://github.com/Seist/Skylight into develop