forking this because master is broken :( - View it on GitHub