Merged and accepted Pull Request #96 from @colony88