Merge pull request #2 from cyplp/master

merge from cyplp repo
patch for flash messages
Merge pull request #4 from Mika64/master

patch for flash messages
merge from mika