Implement Spigot #28, fix versioning and

merge FilipEbRs fix. (Thanks!)