Merge pull request #1 from nhSkript/master

Merge pull request #1 from nfelly/master