Merging Changes

https://github.com/r3wt/UserFrosting/commit/c9d4661c417f2972a728acacdcc5aedced1cce9a
and
https://github.com/r3wt/UserFrosting/commit/99e7a1c59078681e853fd0e9ce1b83594fc98d5f