Credits to @brianium for fixing #8 - Thanks!