Merge pull request #11 from ImMrSn/master

Update