Merge pull request #1 from nhSkript/master

Merge pull request #1 from nfelly/master
Merge pull request #5 from nfelly/master

Merge pull request #1 from nhSkript/master