closes #150, follow what it says on the old site