Fix #1
Merge branch 'master' of https://github.com/Skadier/Craft.Net