Fixes #274
Merge branch 'master' of github.com:partkeepr/PartKeepr