further simplifications
Merge branch 'master' of https://github.com/mrshannon/proplyds