Merge pull request #13 from g-ilham/fixes-to-forms

Fixes to forms
[Rspec] integration
Merged master fixed conflict.
added new fixes