Merge pull request #18 from simdugas/master

form in sidebar