addresses #84
Merge branch 'develop' of https://github.com/ben-bougher/pickr into develop