fix association and rest
Merge branch 'master' of https://github.com/palkan/pieces