Merge pull request #25 from ningosi/master

Changes made on various forms