Merge pull request #32 from garcha/development

merge dev
new notice, and view change
Merge pull request #33 from garcha/master

Master