Improved shape functions
Merge branch 'master' of github.com:escudero89/femris