before devise breaks it
added prop feature
updated readme
Merge branch 'development'