Fix for issue #20
Update attendance fix
Update attendance fix
Merge branch 'develop'